Merge commit 'origin/1379_viewer_hangup'