Fix MAGN-657; MAGN-664
Merge pull request #742 from ke-yu/ChocoButter

Fix MAGN-657; MAGN-664