Reginal Merge branch 'hotfix/cont_table'