Fix/1p adapter

Merged Kilian Weishaupt requested to merge fix/1p-adapter into master

Merge request reports