merge dev to pkeyauth