test d5385fde-8ef0-4883-b4e9-e0dc9789a523 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue