test e09f9377-767b-4d14-8e30-7f940b4f538a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue