Merge "Misc. bit-depth related changes"