test 1076d0d4-48f4-469a-91b5-efdb675f41e7 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue