Merge "Fix docs build breakage"