Merge pull request #4347 from yashwanthgajji/issue/4340