EB-7592 Filter Core and Contract --- NEW CSS house cleaning
Merge remote-tracking branch 'upstream/master'