merge 1.8 util and village packages