test fd6ccc14-0c8a-4f53-b45c-d6aa1df2ba5e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue