Prepare release
Fix dependencies
Prepare release
switches -> options
Merge branch '3.7' into 4.0