Merge "Fix API breakage"