test c5287da7-c5dd-4625-855e-ec9e0a654968 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue