Merging fix for BUG#7672 - the changes will not go into 4.1