Merge "Removing clamp_type from the bitstream." into experimental