Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev