test 4da6771e-ab70-4bc6-9e92-3ec97f40fdc5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue