Merge example fix from 3.2.