Merge from v1.x-stable