Merge branch 't/bits_per_sample'