Merge branch 'fujitsu-laptop' into release