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

This reverts commit 50fcc4efc1c28008375324e8dda70fc5d444ac0b.
Rebase from 'upstream'
Trimmed the branch to only the icart_mini_control sub directory