Merge branch 'devel_pubkeyauth'