Merge pull request #3172 from ysc3839/userselect