Cherrypicked non conflicting dependencies