test 923c1641-121e-4a22-bcc8-29e72642f96f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue