Feature/vnmapper

Catch up changes in develop into feature/vnmapper.
And solve error in a vnmapper test.

This pull request includes two commits:
* 9ad6889 Merging develop into feature/vnmapper
* e29e2ff Making the test pass.