Merge branch 'fix-1985' of https