Resync with upstream

@mbornoz let's keep it in sync...