Version 2.0.7

This PR represents the ongoing development for the next version (2.0.7).