Merge branch 'dev-saving-add_calendar' into 'master'

Add non-standard and non-gregorian calendar support for Saving Module

See merge request es/auto-s2s!22