Merge from FastVideo(laptop)