Merge branch '1972_bw_colors'