changed headers to patch into v3.7 tree