test 45f4d838-8a5c-4b85-bd02-2b4cce8e9fa6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue