[3.7] Other Changes