Merge "Adding CUJ types for Launcher"