Fixes toolkit messages propagation
Rollbacks episode controller
Merge remote-tracking branch 'origin/master'