Merge branch 'mg/lib-gpg-ro-safety'