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

* commit 'e8a9422495d6af9fc68cf4e838a4a5f19177034b':
  Return tasks in correct order.