Merge pull request #2376 from zerkms/ISSUE-2358