[4.9] Other Changes