Merge "Introduce MultiUserUnawareField annotation as a hint" into main