Merge "Adjust mso mysql to latest"