Bug fix 4074
ChangeLog entry for bug 4074 fix
Merge branch 'QA_4_0'