merge QTC plugin into main tree