merge polyglot-jones-controllerClass-switch