Merge branch 'issue/936' into 'develop'