Pick changes from stable-1.1 that are not yet on master