test 2e396ad7-50bc-4628-aeb5-7caa001eefc5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue