Merge pull request #1606 from marcel-blonk/PLFM-3071

move metadata to service