Merge pull request #3249 from wsoltys/remove_stringblock