Merge commit 'origin/issue108' into devel