Issue #11191 done. Fixed calendar