Gsoc merged