Test with plugin visible also
Reset inputXPID and inputYPID also
Merge remote-tracking branch 'upstream/develop' into develop