Merge "Correctly render ISO gainmapped images" into main