refactored async calls, added few logs
Merge branch 'release/1.5'