Merge branch 'mg/gpg-richer-status'