Merge "Fix atom tag missing"