test 5c8fc555-1851-4093-893a-1cf0f7515999 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue