Move to common as shared with frontend/public