Rebasing merge to junio/next (600460d)