filter and state switch without test
Merge remote-tracking branch 'origin/master'