Pr 810 with centralized selecting

closes #810