Merge pull request #1415 from marcel-blonk/PLFM-2831a

use long poll to handle table updates
Merge pull request #1416 from marcel-blonk/PLFM-2831a

addressing review comments