Sync with latest common lib