NX-459: Ported IT related changes

Changes not directly in plugin but "around" it