Merge 1.6+ changes.