Merge "Fix file permissions" into klp-dev