dev-nm17-2 #25

Open
nm17 wants to merge 6 commits from dev-nm17-2 into master

6 commits