Merge pull request #1576 from marcel-blonk/PLFM-3001

Do not build index for tables in trash
Merge remote-tracking branch 'upstream/develop' into PLFM-2997