Merge branch 'issue/1509' into 'develop'