Apply changes from Marek's final review patch to branch. Happy with changes.