Fixed village component for new system
Merge branch '1.7.10'