Fixes: #2500 merging gpg into develop