Eqt support 93/17

Eqt support 93/17