Merge branch 'jh/notes' (early part)