Merge "Move Calendar to /product"