Change done from develop branch for demo server