Merge "Fix include tag rendering." into mnc-dev