Added data validation to tool mode
Merge branch 'dev' into ms