Merge branch 'issue/1276' into 'develop'