LPS-40542 Rebuilding services for compatibility with changes