Fix permissions bug in GPG
fix comment
Merge branch 'develop' into release/12.0