Reduced 5 sec delay in scheduler, closes #1077

(cherry picked from commit dcd8dc24051940c29539438b721f97ee4f84178e)