[HELIX-345] Speed up the controller pipeline for 0.6.x, merge