test eaa809d8-f923-438a-9846-cc2bacde5565 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue