Merge branch 'issue/1411' into 'develop'