test e486f1a7-7e53-46cc-9cfe-ebf8ad9fede5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue