Merge master into server branch

update server brnach with the latest changes from master