fix bug-000 for Townsmen Module
Merge branch 'feature-townsmen' into develop