Merge branch 't/command_util_cleanups'