validate function should be loaded even if dnd not supported
Merge branch 'master' into prod