[2.1] Other Changes