Disabling 3rd party dependencies for now
Merge branch 'refs/heads/f/rpm'