test 3d002b6c-b060-434c-a579-a7770a796e72 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue