test 57b7975a-c7d3-4714-ab35-b58ad11106f5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue