Merge pull request #330 from dragos/isssue/tasks-disappear-1001401

Use Scala specific task markers.(cherry picked from commit f24829080cc91df340335f06280cbc3bc4c10973)