Merge with current Rawhide spec