test edb7b1e5-3b58-4495-9714-917435c3d177 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue