MS22-106: Change a list of field to be mandatory.