test 3414f27c-b331-4a3f-9983-300dedac4b74 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue