Merge "CAN Configurator Service"