sync feature/work_branch 20.02.2014