test 454a52e4-c988-46e5-a469-d2f2938604d1 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue