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

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