OC-11340 parameterized resolving (2)