Merge "Use nullable field and boolean rather than optional" into sc-dev