Merge branch 'issue/1878' into 'develop'