Merge "Update Calendar main comment"