Merge "Linearize extrabits writing." into nextgenv2