synchronization with auth branch
Merge branch 'master' into cover_transfer_and_saving
fixed possible NPE
Merge branch 'master' into cover_transfer_and_saving