CLC-1209 Tweak initial feature settings structure