9 Commits (xbzk/flicker-fix)