Develop

8 pull requests containing 1 minor change and 7 patches.