Merge "Fix CountryDetector NPE" into klp-dev