Rebasing merge to junio/maint (8695353)