Merge branch 'issue894' into 1.7.x