Import stable commits into develop after releasing 2.2.0