Merge "COMAC-97 Apply the latest changes to comac-in-a-box"