Merge branch 'origin/shopiteco'
Revert