Merge pull request #1994 from quickwritereader/develop