test c756995e-5cd3-4fe5-b544-97b58ec46cb7 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue