Merge "Add CR Widget IDs to the generator properties"