#58: Backport from 3.0