Rebase commit

Pull in changes from the metaverse