Bump v2.3.7 Small Tweaks + Prepare for Hybrid Bump