LPS-30425

Heya Iliyan, can you please review this pull request, from both the code and interaction perspective? If there's anything missing, please communicate it with Patrick Yeo. Thanks Iliyan\!