Merge "Move the attribute tags"