Changes from upgrade to ADT 22