Revert "Trimmed the branch to only the icart_mini sub directory"

This reverts commit 5950c23983a0a8ec874c041145bd0dcaff7b4097.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the icart_mini sub directory