Merging from 1.7.10 version
Merge pull request #131 from kzarius/1.7.2-updating

Merging from 1.7.10 version
Merge pull request #132 from SkyNetAB/1.7.2-updating

1.7.10 fixes backporting