[3.5] Other Changes