Merge "Convert activation to task" into nyc-mr1-dev