Update dev with master
Especially to have changes from #856 in current development
.
But also some additional commits that bypassed the development
will be merged from latest master
.
@DaJansenGit: Feel free to perform the merge after approval.