Merge "Move image intern table into image" into mnc-dev