Merge testing server into releae branch