Merge branch 'master' of D:\workspace\wikt with conflicts.
Services refactoring