Import WAI 2.2.0 beta 3