test b5609ba3-823b-4a6e-b3c5-e0ce38e51b58 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue