Pull request for v1.2