Merge "When adding a window evaluate all tasks." into klp-dev