Update from upstream branch next

Updated until 79d92cb5