fixes in print table
Merge branch 'master' into edge