Yesterday
merge from tutorial_video_fix_2