Merge "Added server mac address to Endpoint" into stable/beryllium