test 5d102e5f-fd31-4a6b-9e70-87d3b9983087 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue