[pull] canary from vercel:canary#1117

pull[bot] merged 2 commits into

code:canarycode/lib-next.js:canaryfrom

vercel:canaryvercel/next.js:canaryCopy head branch name to clipboard