Merge "Import utility class directly from the connectivity project" into main