Merge branch 'master' into wip_leon_T7281_table_editing_widths_doent_work