Update again to calendar 7.x-3.x-dev to resolve issue #1471400