Rebasing merge to junio/next (705f258)