Merge "Fix a behavior change in dicttool"