Merge pull request #2996 from UCIS/patch-7