Merge "Split down patch-comment-table.sql"