some changes introduced by 4daa6da5, 26b6e299, 17898ce0 were regressed during today's merge conflict resolution of !11573.

This commit serves to reapply those changes.

/cc: @rspeicher @stanhu @mikegreiling