Brings in latest service management library changes