Merge "Follow-up to I1e4dd97"