Merge branch 'main' into 988-remove-switches-fix_638_energie_iac_rom-fix_inv_diffuse_weigth