Fixing like 10 memory leaks Fixes #4670 (commit: fbe0cd1)
2.1.206 - Memory leaks fixed and other changes Fixes #4681 (commit: c36ff85)