Merge "Add "entropy" experiment" into nextgenv2