Merge "update msbPort"