Merge "New comp_inter defaults." into experimental