Merge pull request #1365 from marcel-blonk/PLFM-2839

initial API