Merge commit 'origin/bug-894' into bug-894