Merge branch 'issue/1383' into 'develop'