Merge pull request #7326 from remitamine/clipfish