MT#5879 Lost part of merge on master head.