Merge "Increase max color options size" into main