Hotfix - Separate class definition, so its autoloadable.
Merge branch 'hotfix' into develop