updates from other 2.2 branches