Fix for setting status via episode status manager
Merge remote-tracking branch 'origin/dev'