test 6698ca43-86b3-43d8-96c5-9478d9e05a7e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue