test 6dfdd9e1-3711-422a-8052-488dbc66e5c8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue