HCOLL-167 added support for keyset
Merge remote-tracking branch 'origin/master'