Fix wrong var assignment
Change look ahead to 3 months for scrap task
Merge from develop