fix files after back porting merges from master to atlas/v27r2
a few files got messed up in the back-port of a large number of merges from master to atlas/v27r2, due to issues with the ordering of the merges. this MR fixes them.
a few files got messed up in the back-port of a large number of merges from master to atlas/v27r2, due to issues with the ordering of the merges. this MR fixes them.