Final commit pre 1.3.0