Merge pull request #1148 from swastik959/v2.13-branch

Merge pull request #1148 from swastik959/v2.13-branch #1827