Added a patch to fix issues on Mer