EB-7592 Filter Core and Contract ----  Initial Commit of CSS Changes
Merge remote-tracking branch 'upstream/master'