Fixes #8632 - Redoing docker tables/fields