Merge "Return "null" cycles for deprecated callers." into pi-dev