Merge "Remove unused setup_tables" into feature/zuulv3