test 69341e6b-69d0-4bf1-aaa7-cc62a0069ef7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue