Merge "Make sure protocol version is always set in sync services"