Merge "Fixed that CMAS duplicate detection is not working" into mnc-dev