sync from 1.06 for review