Merge "New infrastructure to switch remaining commands to "cmd" calls."