Update everything up to (and incl.) 8.2.4
Complete section 8.2