Merge "Move get_user_by_username to common part"