test cc91a200-5e54-4804-9f33-258ca6e3083b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue