Merge "SO refactor - refactor class UserParamsServiceTraversal Issue-ID: SO-3489"