Merge "Fix dicttool build"