Merge branch 'grampus-notebook' of https