Merge "Make client callbacks consurrent modification safe" into main