Merge "Decoder: Fix in the case of MMCO 6" into mnc-dev