Improve raw view.
Merge commit 'b8e798a' into no-debug