Merge "High-bitdepth bugfixes"