Updated to use OriginFilter rather than CORSFilter (as CORSFilter.java isn't in the code base yet)