Merge "Check that we have enough bits to read" into mnc-dev