Merge change 9653

* changes:
  Fix getParameters() default implementation.