Merge branch '3204_viewer_default_color'