Merge "adapt_scan experiment" into nextgenv2