[PATCH 2/2] ctl: Recent XML format changes