Screenshot added, DB password set
Merge origin/master