Last changes from latest release (2.0.7)