merge with core-tools repo