Review for new SelectServer architecture

This PR is intended for code review, not for upstream integration