Merge "CTA2075: Synchronize dispatcher listener map" into main