Merge "Fix enhanced RC data attribute sanitizing"