Merge branch 'issue/749' into 'develop'