Solved filter
Merge branch 'origin/Solfamidas'