Add marketplace client
Merge branch 'bugfix-add-marketplace' into bugfixes