Merge "Optional fields - reverted"