Upate schema.sql definition
Merge remote-tracking branch 'origin/stable' into stable
Refactoring get_username fucntion to make code more compact