Merge "Fix extra_cmds is None crash" into main