final commit for v3.7, small update