Merge branch 'master' into eduard-final-1
Test Case: Favorite Surfer
Merge branch 'eduard-final-1'