Merged changes form main trunk (2.2.8, 2.2.9)