Merge "Put next task on top of stack if top is finishing." into klp-dev