Merge "Prevent integer underflow if size is below 6" into mnc-dev