Merge "Fix file permissions"