Merge "Automatically flag intrinsic files" into experimental