Merge "Add bit accounting information for deringing" into nextgenv2