test 82ab73d0-12fa-4c85-850b-4e465e73b5a9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue