Merge branch 'issues/1026' into 'develop'