Bring up to Octo-Kat's present manifest for kk-4.4 branch