smarter iteration rerender integrate to master
@bug W-1301124@
Merging origin/jay/master-pending-iterateintegrate into master