[2.2] Other Changes