Merge pull request #1078 in master
Merge pull request #1079 in master
Fix TODO.md replace link to pull requests with link to issues
Merge pull request #1105
Merge pull request #1105 in develop