Merge commit 'v1.7.5' into svn-fe