Merge branch 'topstar-laptop' into release