resultType not supported as param for qi in 2.10.x - not needed anyway because
isTemplate is set to s
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x