Merge "Fix broken build"