merge commit
Fix features on doubleenhancedpicker