Make use of the new combined-lights module in the base package
Authored by: ehofman 2022-01-31
Parent: [r6345]
Child: [r6347]