Fix permission denied error
Merge branch 'release/v2.1.4'