Fixes #8009 - Make sure the final version of helpers is in the controller

(cherry picked from commit 94651a72552d90a811f8b5623ece86d1ef038028)