Changes up to 8.4.6