Merge branch 'issue/1798' into 'develop'