Fix DISCL-242 - Concurrency issues in MasterToWallChannel