test 86afbeb5-b328-4de5-8d63-f79eeafb6c1c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue