test aa4bb126-63e6-42c0-98b3-e1cff7104449 (rebased onto develop)



This is the same as gh-6378 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testPushRebaseContinue