test 68d62245-160c-4389-acff-540a8e197b18 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue