Added missing ViewPatterns
Fix a test
Merge remote-tracking branch 'origin/simpler-dispatch' into persistent2-simpler-dispatch