Fix wrong set_status call after refactor
Merge branch 'bug/fix_wrong_status_call' into develop