Integrate extensions "ter" and "terfe"

Extension "terfe" wil be included as "ter_fe2"