draft of new patch for gcc v4.9+