Merge "Add additional fields validation report"