Merges from v0.2(experimental) and removes unused import in Controller