Added diffs to HS branch for merging into master at some point