[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)