Merge "Fixed calendar fields comparison"