test 7f672281-521f-4e4c-96f8-3431a202ff17 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue