Initial update to 3.3.8 and fork