Removed ContainerAware feature