Merge branch '2228_panelize_input_colors'