Merge pull request #16991 from pradpnayak/customFieldDefaults