merge upstream changes from branch-1.1