Merge "Parameter adjustments to loop restoration" into nextgenv2