ashnazg changes for v1.10.11