Added default values for some arguments
Merge remote-tracking branch 'origin/v2.1' into v2.1