Merge camsys/oneclick

Merge of upstream / fixes for namespace