Added synchronization on credential and some more logging
Merge remote-tracking branch 'origin/develop' into develop