Merge pull request #1587 from brucehoff/PLFM-3080

Plfm 3080
Don't retry if the table no longer exists
Merge pull request #1594 from marcel-blonk/release-66

Don't retry if the table no longer exists
Merge branch 'release-66' into develop