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

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