Merge "Fix broken checkbuild"