Merge branch '3145_true_color'