staples additional fixes
Merge branch 'master' of github.com:YotpoLtd/yotpo-customizations