Merge "[Calendar] Fix Validator issues"