Prefer CLI filter options to those in files
Changelog for #1602.

[ci skip]