[ftr] icc-friendliness enhancement