[Naval, Vivi] Adding provision to ensure village_name is always < 100 characters
Merge commit 'b6cdd336516b17631a491507ab8faadf69ce2219'