Fix Bug#20637. Do not merge to master