Merged changes form main trunk up to 2.2.4