Merge "Simplify cloner required parameters"