Missed commits from merge