test f235b752-5698-4279-8b53-36050d4e1ae9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue