Resolved small conflicts on 05 (including references added by Margreet) & 06 (including Bloglink title)