Make sure filter command quits if canceled
Merge branch 'master' into ST3