[lives/f25] Update to 2.8.4