Merge pull request #1569 from john-hill/PLFM-3032

fixed
Merge pull request #1571 from marcel-blonk/PLFM-3048

put current row cache in the index database
Merge pull request #1572 from marcel-blonk/PLFM-3048

add comments per code review
Merge branch 'release-63' into develop