Some changes in the frontend server
Merge remote-tracking branch 'upstream/master' into webServices