Fix table duplication
Merge remote-tracking branch 'origin/master' into vmnfix
Merge branch 'vmnfix'