Revert "Revert "Shakalaka -> mercy""

This reverts commit 78d4bddca7bf9c08e8ff9860075a39d576901295.
Fixing previous reverts