Resolve #3255924 "Rebase"

Karl Shearequested to merge
issue/calendar-3255924:3255924-rebase into 8.x-1.x

Closes #3255924

Merge request reports