Merging in Ti Lightcrafter control code