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

This reverts commit f22e40a3b9fa4e6425ec9f531b84c23f34f2e4bb.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the icart_mini_control sub directory