Merge branch 'feat/async_gpg' into develop