test 9edc20f4-85e5-45fc-ad41-f6e26b7914b4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue