swc-1323 - table status refactor