compacting for v1.6.7