Fixes: #2501 merge repository into develop
Fixes: #2500 merging gpg into develop