Merge from v2.2.2 (official)