test 62fe8926-3062-4206-aed2-e5b0fe087184 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue