test 9016e1c5-823c-4859-8c68-587299b13824 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue