Merge branch 'ets_table_creation' into v56