Merge "Refactoring deringed block list code" into nextgenv2