V1.1.x

rebase for 1.1.x code freeze.