Merge "Fixes executable permissions"