Relatives changes and updates from database
Merge origin/master