refactor of action descriptor pipeline

(cherry picked from commit 634f756e7fd303fc3022563fcd8fb9b1cb47fba2)