Unfortunately some important changes to make this branch consistent and functional only existed on the wallaby branch. So this commit brings them in sync.