[#43] Merge branch 'main' into feature/43-support-options-color-picker