Merge "Updating 3rd party dependencies"