merge hotfix (chooser patch)