SOC-3916: Restore current position field as mandatory