Merge the latest version 2.11.10 changes
Apply the color picker to single fields as well (see #5240)
Merge remote-tracking branch 'upstream/hotfix/3.0.4' into hotfix/3.0.4