Merge pull request #24147 from scmmishra/desk-enhancements