OC-4667: Merge Google API-based implementation