Merge "Refactoring and cosmetic changes to ext-inter expt" into nextgenv2