test 6696b621-f3ff-43b3-970b-f7b2a9a671ce (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue