Changes made by Siyka Marinova (siyka.marinova@gmail.com).
Merge commit 'f8e6b7ca73b4d469f1341b680a1bfb92c72306d4' into ub
Changes made by Siyka Marinova (siyka.marinova@gmail.com).