Merge branch 'fix-1958' into 'develop'