Backport fixes from trunk since revision 1555.