Yesterday
merge from tutorial_jungle_rock_fix