Merge "Return tasks in correct order." into klp-dev