Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected.