Merge CAF changes for Gamma/RGB init