test 24f8c250-fee1-4979-8342-a8fbd66c6dc7 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue