Merge pull request #13640 from pradpnayak/notevalidation