added dynamic custom pre-defined filter support
Merge commit 'HEAD@{1}'