Merge branch 'issue/2069' into 'develop'