Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev