[HELIX-345] Speed up the controller pipeline, rb=16407