Closes #4250 Merge request !3082 (cherry picked from commit d4bdf98b) b13fc888 fixed removal of exceptions from calendar dates c9f0a37f added code improvement