test 3de62f66-90a5-4db2-a5d5-63922969b47b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue