Merge branch 'issues/570' into 'develop'