Merge "Get WSM per user service dynamically." into main