ensure we call advance with the correct context
Merge branch 'master' into start-page
don't create a new marketplace every single time we load the page