Merge branch 'issue/2261' into 'develop'