Pull request for v1.1