chore(Update): Updated to latest upstream changes.