Re #9179 Merging in recent master changes