[+FEATURE] Backport CommandController Implementation