Reintegrate parallel action

Fixes: bug 1221505
Fixes: bug 1225759

Change-Id: Id4c915d36d0da679b313dba8421ac621aeb7c818
Merge "Reintegrate parallel action"