commit for pull
merged TaskWindow conflict
Added info logs