CAM-870

Hey guys.
Could you merge this please - we would like to use that in our current POC. Maybe you could also close the issue after review?
Thanks
Bernd