Merge branch 'js/log-gpg'