Merge branch 'mg/gpg-interface-using-status'