Merged 2.2 branch from standards edition