test 99ea477a-7a67-4673-8a7a-d84790777604 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue