Merge "Remove "isTagged" mapping method"