fix bitterness on copy hop
Merge branch 'master' into prod