changeset from add_debug