last set of updates for v3.7