Merge "Allow killed task to remove itself" into klp-dev