Merge pull request #2261 from nisheeth-barthwal/develop

Fixed Issue #2239