Merge branch 'fix-fatal' into item-view