Merge branch 'fix-827'