From Safety Branch

Copied files that differed (non-binary) that had comments added by git
from the safetybranch.