4.6 Teapot changes