Sweeping !42750 from 21.3 to master. Fix the mm cross talk implementation to handle cross talk 0

Fix the mm cross talk implementation to handle cross talk 0

See merge request !42750 (merged)