Merge branch 'develop' into feature/#31