test 04a5d88b-2063-4e70-98bc-5e136e2f348c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue