test bfc4050c-2efe-4b43-a503-58043bec0842 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue