Migration to version 2.9.2.9

Found a backup! *phew* Merge and cleanup.
Added new support class.