Merge branch 'nfp-ksettings'