Merge "Adjust dependencies on "core" libraries"