backport (sh002i): this file didn't get backported before, since it didn't exist in this branch.
Changed paths: