add log
try to fix concurrent access to HashMap
Merge remote-tracking branch 'origin/master'