Apply dfe46ab to 3.0-unstable branch