test 69037250-4335-4b6f-ac4e-e3e757bdce51 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue