Starts replacing table endpoint
Merge branch 'master' into CDB-1478
Merge CDB-1478 into release/2.8.2