Added latest upstream updates