Merge "Fix regression from ag/2987716"