[4.6] Other Changes