Update iterator, utility, core from master.