Merge isdraft-feature branch
remove unneeded explicit table name