merged mach-msm from source code