Backport #3481 (invalid sub-option storage in CB)

Need to backport the ticket mentioned in the title.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information