Merge "Fix deprecation warnings"