Merge branch 'issues/897-custom-hansard-view'