test 66e19ee8-3cfe-4383-8b4f-9c3542ace5e9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue