Merge branch 'devel' into issue/86/helm-charts