Fixed: Stable branch is broken
CS fixes + typo + doc + small fixes