filter matrix validation
Merge branch 'master' into ivan_0.2
Merge branch 'ivan_0.2'