Merge branch 'issue/1975' into 'develop'