test fa232ff8-cafa-480b-bfd1-c355554975cb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue