Merge branch 'issue/2068' into 'develop'