Bug 3248

Updates to re-scheduling action