Merge branch 'server' : #v1.5.7b

1 job for master in 20 seconds (queued for 1 second)