Merge "Move distortion correction to correct opcode list." into mnc-dev