CRMT: Partial merge from Michael