v1.1 branch patch