Merge pull request #462 from MrPetovan/task/3942-move-user-to-src