Backport iround support from mainline.