Merge "rdmult data type change to fix high bit-depth"