Some missed commits in branch