Merge pull request #747 from PradyumnaNagendra/release-2.5.0 Issue #000 fix: Merging cqls from release-lms-2.5.0 to release-2.5.0
Merge pull request #747 from PradyumnaNagendra/release-2.5.0 Issue #000 fix: Merging cqls from release-lms-2.5.0 to release-2.5.0