Backport from 2.0