For ENG-6263, turns out there are two components that need to be forked on