[FIX]Optional Arguments

Merged Gastón Bertolani requested to merge 12.0-fix-src-calendar into 12.0-stage

Merge request reports