Deploy of can_run_now-improvements