Merge "added containermanager shell feature"