make it in line with geoserver master