Merge "Add join conditions to ActiveUsersPager"