Merge 2-0-stable from upstream