Merged from Cai 4/22.