Merge upstream, address conflict in src/utils/cmds/cmds_test.c