test 3e012f2c-3dad-41b5-8377-00497f5428c6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue