parameter validation
Merge remote-tracking branch 'origin/editor' into editor