test 252bfe82-1f4c-47f5-b74b-4fe623dfd0d9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue