test 5d6f6982-07fd-470f-aede-d9294974548c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue