Merge pull request #1946 from wpaulino/init-features-user-config