Merge 1-x-stable into master