Experimental changes, for stable releases