Merge "Experimental headers/libs"