jwm 2.3.4 -> 2.3.5