Merge "Merging and bug-fix in enhanced_interp experiment" into experimental