Merge branch 'issue/1043' into 'develop'