test 5b5515f3-c288-4f6a-9fda-04f00bf6ebf8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue