Merge pull request #857 from wolfmanjm/refactor/G38-processing-fix-for-deltas