Merged fix for MER#1674 to 2.0.2 branch
This tag has no release notes.