Calendar back runtime

[j.jaffeux (Joffrey Jaffeux)]

@sam

hoping to land it some time next week.

Noting, that we will do our best but for various reasons (release timeline, handling side effects of these changes in other projects), it might be in August.