Merge "SF: add back accidently removed field" into main