Merging changes form main trunk 2.2.5-2.2.6