Clear callback map after invokation hangs

#2273
Made changes as per code review feedback

#2273
Made changes as per code review feedback

#2273
Made changes as per code review feedback

#2273
Merge branch 'release' into dev