test 269ed5d4-f438-4e5c-8abc-035a9486b844 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue