synchronization with auth branch
Merge branch 'master' into tags-master
fixed possible NPE
Merge branch 'master' into tags-master