Merged DROP TABLE statement from master branch