test de0dbf93-b930-481e-be0f-834f6e35bc30 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue