Experimental wicket atmosphere
Merge branch '2.1.x'