add support for authentication keys
Merge remote-tracking branch 'origin/4.1' into 4.1