Merge branch 'master' into ecarm002/aggregate_sql_functions

* master:
  fix for issue 712
  Fixed a typo in the merge policy parameters.