Merge pull request #40317 from barredterra/parcel-mandatory-fields