Kingfisher

99726553 - Merge pull request #2027 from onevcat/feature/final-configuration