Code

Merge branch 'jb/required-filter'