Merge "Change apt_mk_version => mcp_version"