Merge branch 'feature-s/retry-gpg' into 'dev'

Retry GPG

Closes #3610

See merge request !844
7 jobs for feature-s/dev in 12 minutes and 30 seconds (queued for 4 seconds)