Merge "Pipe through attributeTag for one self-permission check"