Changes for Kaleidoscope 2 integration.