merge fix for 3.9-rc8 , mainly missing exports and remove a warning for an unused varaible