Merge branch 'laptop_dev'
Merge branch 'laptop_dev'