Merging final 2.2.1 changes into WoL branch