Merge branch 'ping-daum-fix-clip'