Fix bug#20233, do not merge with master