Merge branch 'fix-issue-808' into staging