Merged to single patches repository and upgraded to Grizzly 2.2.18-SNAPSHOT