AliBharwani Merge branch 'laptop'