Initial import of Notebook v2.1.x sources