Sync with latest changes from common/lib