Rebasing merge to junio/next (38e1251)