Merge "Fix tags and entity reference" into mnc-dev