Merge "Get rid of dependency on core from linux build (2/2)"