test 8d61307c-6b5a-4119-b2a1-c4b1b47e6f05 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue