Merge branch 'develop' into issue194