Merge "Added container wrapper against action to support augmentation"