test e4534975-c9ae-42f4-bbe4-712e1c646783 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue