Experimental merge. Details to come if successful.