Merge branch 'hotfix/4652'

Close #4652
Make ValidatorPluginManager aware of DateTime validator
Merge branch 'hotfix/4665' into develop

Forward Port #4665