Subjects, Pooling, bux fixes, cleanup, refactor,
Merge remote-tracking branch 'origin/devel'