Merge pull request #424 from kasunchathuranga/Bug3970