Merge "Change serverID to site"