Merge "Harmonize and fix coeff context computation" into nextgenv2