CC-217 EAN field size too big
Merge commit 'dd96f858473e6deb794e4a04b86f7756dffa3848' into HEAD