Fix problem with filter initialization
Merge pull request #6753 from stuartwdouglas/8.x

Fix problem with filter initialization