7732 custom select

This updates @imaffett's PR with coding style fixes.