Merge "Add NCMP tag in properties"