Merge branch 'gui' into cache