[wip] prep marketplace update for 2.1