Merge "Improve tonemapping utilities"