Compacted code from last commit
Changelog