Most of that was already in place, just one signal wasn't wired correctly. (cherry picked from commit 2a75eca8)