Merge pull request #3757 from andy5995/iss-3752