Merged ACKS from 3.2: added Yuxiao Zeng