Merge pull request #2192 from ciso-commits_1