Merge "Fix file permissions and include path"