[BW]: [NIP] Further changes related to static QT support
[BW]: [NIP] Probably final changes related to static QT support