Merge changes from the vanilla branch