cherrypick custom mysql module to JM branch