[hotfix] marketplace picker tracking and longer load

updating master with hotfix we did on production