Case #3628 - Put population types in a separate feature