Merge branch 'issue/1023' into 'develop'