Rebase to upstream, merge in fix-recipes-databag-crash