Prepare table for Shadow DOM
Merge branch 'master' into shop