Merge remote-tracking branch 'ms/fake-uname' into next