FORUM-848 | Improve performance when open from UserSelector.
Merge commit '5981179a69a0ef8e10f70b0b3c2e12e6fe942869' into HEAD