TODO added in job controller
Bug fix
Merge branch 'smronju'