Headless Client Changes for 1.36