Merged master
Removing unwnated filter