Merge pull request #16810 from scmmishra/lms-beta-v2

feat: LMS Feature