Merge branch 'issue/1218' into 'develop'