merge validation editor branch to trunk