Merge colorpicker changes into release

:MERGED:

Merge request reports

Loading