Merge branch 'issue/1276-2' into 'develop'