test 6c8d62fc-7dd8-41f8-a891-13a81209f91c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue