Merge "Merge MISC_FIXES" into nextgenv2