Merge remote-tracking branch 'origin/devel' into issue/104/build-errors