Patch for PickNaver
Merge branch 'refs/heads/pick' into dev