Merge branch 'nvram' into next