Experimental features are merged in the master version