0228b83 Merge branch 'live_display'