chore(update): merged in latest upstream changes