Bug fixes#24

bdurand wants to merge 4 commits into

mainbdurand/support_table_data:mainfrom

detailed-reviewbdurand/support_table_data:detailed-reviewCopy head branch name to clipboard