Merge branch 'issue/1667' into 'develop'