Merge other missed commits.