Merge branch 'develop' into cli-wrapper