Fixed bug caused by Taras.
Made refactoring.
Merge remote-tracking branch 'origin/develop' into develop