Merge branch 'base' into desktop