#3292 working on thread safety of ClientMapController