Merge branch 'fix-1591' of https