test 291e36f9-2cfc-4acc-959b-c0a5f93b4cbf (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue