Merge branch 'issues/1016' into 'develop'