Merge 1-1-stable into master

This backports the changes in 1-1-stable to master, and takes care of merge conflicts