test 15e820fd-0e60-4a29-89f9-208703569b65 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue